blktap: re-enable blktap1 if blktap2 is disabled
authorKeir Fraser <keir.fraser@citrix.com>
Thu, 18 Jun 2009 09:29:58 +0000 (10:29 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Thu, 18 Jun 2009 09:29:58 +0000 (10:29 +0100)
commit590b3ce1d371e5d53fadb28ee965cdb2a4765c73
tree7149956d823303936ab58d356e14cf45ec4731cf
parent6c11039cbd07fb537b33dbf57d579ce57be1ab88
blktap: re-enable blktap1 if blktap2 is disabled

This patch re-enables a useful blktap1 for users who disable blktap2.
Itremoves tapdisk and blktapctrl from blktap2, both of which cause
problems with blktap operation.  In addition, this patch modifies xend
to check for blktap2 installation.  If the blktap2 driver isn't
running (hopefully because the dom0 kernel option wasn't selected) we
fall back to blktap.

Signed-off-by: Dutch Meyer <dmeyer@cs.ubc.ca>
12 files changed:
tools/blktap2/Makefile
tools/blktap2/daemon/Makefile [deleted file]
tools/blktap2/daemon/lib/Makefile [deleted file]
tools/blktap2/daemon/lib/xs_api.c [deleted file]
tools/blktap2/daemon/lib/xs_api.h [deleted file]
tools/blktap2/daemon/tapdisk-channel.c [deleted file]
tools/blktap2/daemon/tapdisk-daemon.c [deleted file]
tools/blktap2/daemon/tapdisk-dispatch-common.c [deleted file]
tools/blktap2/daemon/tapdisk-dispatch.h [deleted file]
tools/blktap2/drivers/Makefile
tools/blktap2/drivers/tapdisk.c [deleted file]
tools/python/xen/xend/server/BlktapController.py